From 2eece4b6635fc3482ca31f7e0354172664f6e918 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 25 Aug 2020 09:33:18 +0100 Subject: [PATCH] Bundle a copy of gtk-doc from the gtk-doc-for-gtk4 branch Until support for GTK 4 actions is merged into gtk-doc git master, including a suitable copy of gtk-doc in this source package lets us build it without experimental's gtk-doc having to be the GTK 4 version. It's currently version GTK_DOC_1_32-57-g3651bf3 from the gtk-doc-for-gtk4 branch. --- debian/control | 3 +-- debian/control.in | 3 +-- debian/gbp.conf | 1 + debian/rules | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index e6df6dc1db..f02a8158fd 100644 --- a/debian/control +++ b/debian/control @@ -52,8 +52,7 @@ Build-Depends: adwaita-icon-theme , xauth , xsltproc, xvfb -Build-Depends-Indep: gtk-doc-tools (>= 1.32+git20200421.gtk4), - libcairo2-doc, +Build-Depends-Indep: libcairo2-doc, libglib2.0-doc, libpango1.0-doc, pandoc, diff --git a/debian/control.in b/debian/control.in index d748887288..96abb2e411 100644 --- a/debian/control.in +++ b/debian/control.in @@ -52,8 +52,7 @@ Build-Depends: adwaita-icon-theme , xauth , xsltproc, xvfb -Build-Depends-Indep: gtk-doc-tools (>= 1.32+git20200421.gtk4), - libcairo2-doc, +Build-Depends-Indep: libcairo2-doc, libglib2.0-doc, libpango1.0-doc, pandoc, diff --git a/debian/gbp.conf b/debian/gbp.conf index 7eebcaf2fd..c406802fc5 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -3,6 +3,7 @@ pristine-tar = True debian-branch = debian/master upstream-branch = upstream/latest upstream-vcs-tag = %(version)s +component = gtk-doc-for-gtk4 [buildpackage] sign-tags = True diff --git a/debian/rules b/debian/rules index ed69010ecd..1c7dc288f0 100755 --- a/debian/rules +++ b/debian/rules @@ -142,6 +142,7 @@ override_dh_clean: debian/control override_dh_auto_build: $(call dh_subst_files,$(all_binaries)) override_dh_auto_configure: debian/control + ln -fns ../gtk-doc-for-gtk4 subprojects/gtk-doc dh_auto_configure \ --builddirectory=debian/build/deb \ -- \ -- 2.30.2